From d64896a9f0ea430466901ef08f2bf0dcd27da6b5 Mon Sep 17 00:00:00 2001
From: "emellor@leeni.uk.xensource.com" <emellor@leeni.uk.xensource.com>
Date: Wed, 23 Nov 2005 19:31:22 +0000
Subject: [PATCH] Merged.

---
 linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c | 6 +++---
 tools/examples/block                                 | 6 ------
 tools/examples/block-common.sh                       | 4 +---
 tools/examples/block-enbd                            | 4 ++--
 tools/examples/block-nbd                             | 4 ++--
 5 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
index a3efed0d05..91ff5069aa 100644
--- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
+++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
@@ -155,6 +155,8 @@ struct netfront_info
 	   (_list)[0]  = (_list)[_id];				\
 	   (unsigned short)_id; })
 
+#define DEBUG 1
+
 #ifdef DEBUG
 static char *be_state_name[] = {
 	[BEST_CLOSED]       = "closed",
@@ -900,7 +902,7 @@ static int network_close(struct net_device *dev)
 {
 	struct netfront_info *np = netdev_priv(dev);
 	np->user_state = UST_CLOSED;
-	netif_stop_queue(np->netdev);
+	netif_stop_queue(dev);
 	return 0;
 }
 
@@ -1164,8 +1166,6 @@ static void netfront_closing(struct xenbus_device *dev)
 
 	DPRINTK("netfront_closing: %s removed\n", dev->nodename);
 
-	close_netdev(info);
-
 	xenbus_switch_state(dev, NULL, XenbusStateClosed);
 }
 
diff --git a/tools/examples/block b/tools/examples/block
index 79636ac20a..7ea044f4bc 100644
--- a/tools/examples/block
+++ b/tools/examples/block
@@ -3,12 +3,6 @@
 dir=$(dirname "$0")
 . "$dir/block-common.sh"
 
-case "$command" in
-    online | offline)
-        exit 0
-        ;;
-esac
-
 expand_dev() {
   local dev
   case $1 in
diff --git a/tools/examples/block-common.sh b/tools/examples/block-common.sh
index 2e46831111..6c44f87c45 100644
--- a/tools/examples/block-common.sh
+++ b/tools/examples/block-common.sh
@@ -21,9 +21,7 @@ dir=$(dirname "$0")
 
 findCommand "$@"
 
-if [ "$command" != "online" ]  &&
-   [ "$command" != "offline" ] &&
-   [ "$command" != "add" ]     &&
+if [ "$command" != "add" ] &&
    [ "$command" != "remove" ]
 then
   log err "Invalid command: $command"
diff --git a/tools/examples/block-enbd b/tools/examples/block-enbd
index c58adb595d..75c6f257aa 100755
--- a/tools/examples/block-enbd
+++ b/tools/examples/block-enbd
@@ -11,7 +11,7 @@ dir=$(dirname "$0")
 . "$dir/block-common.sh"
 
 case "$command" in
-  bind)
+  add)
     for dev in /dev/nd*; do
       if nbd-client $2:$3 $dev; then
         write_dev $dev
@@ -20,7 +20,7 @@ case "$command" in
     done
     exit 1
     ;;
-  unbind)
+  remove)
     nbd-client -d $2
     exit 0
     ;;
diff --git a/tools/examples/block-nbd b/tools/examples/block-nbd
index 142a403c0f..8c5cb17b79 100644
--- a/tools/examples/block-nbd
+++ b/tools/examples/block-nbd
@@ -11,7 +11,7 @@ dir=$(dirname "$0")
 . "$dir/block-common.sh"
 
 case "$command" in
-  bind)
+  add)
     for dev in /dev/nbd*; do
       if nbd-client $2 $3 $dev; then
         write_dev $dev
@@ -20,7 +20,7 @@ case "$command" in
     done
     exit 1
     ;;
-  unbind)
+  remove)
     nbd-client -d $2
     exit 0
     ;;
-- 
2.30.2